From 60b80787c1cd4007be6a5dc987cee5eea2c6cc66 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 28 Jan 2026 21:03:25 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 596482 -> 597201 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index c3555930fe9..0e1a2ec9c72 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -924,7 +924,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_settings \
 	odk_settings_generated \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 	odk_scripts \
diff --git a/configure.ac b/configure.ac
index de222a4238c2a560a57d3b28678a0a2503a0ab08..6fbbfdecdc9789f81ed76e40b6dd27f5880ff9c0 100644
GIT binary patch
delta 666
zcmaJ-O=uHA6lT(S&FpSAwnVd=MChcZXrXB%RFFWlX$xu!#uDqHQj@jWXtZW6yRirg
z>ZJz{f;qf{h=t}XBE{09f_N6ZmH2ZJ^ddbLq;+<i;LpK<Z+_nUzVE$x57rXzHxl>O
zh}BeOF4o0s#x0|4%|Ct^#?2EX5Ll`@SCj1^_O6hqzw>yzN)D%Tg6;`jF&D!64YTGL
zPSvUn^JLOhTXm;nz{|LzlW-zGImQ30JZm|PyE`#vm9O)8!!~i`6-h*9Y~zZV_A2dJ
zcYJZ{83|!&m4y1dX6A;5_I~5mFSZ-b+&1mG<x-Of_yoGvOHDdm={0M{<pr}SO7-)2
zhSx0Y*?=hS+oC=A>1#K`mJCyxRIPBwv>o1`_|p`L<~xWf1xE25^#^g}2MyvK1$0a=
zfr?KR7-)>?6yGS&hiP4KFMR<ScNK`?lU*8WJQ|m9tmUJ4EC3q5SY%<G4Zu-6KH%3x
zlHtxK8T2g96&S-|Nw|IpK&p|7F{CQQ@%!s84O{zx;iw8ptlS5^kw3|BQH2aX|4A9%
zlz`$(6%L&CW+%2vRhGE9V4Jce@p{cR9iGcx$WG=bL|i0Yo;W;)d;gnKsp3Z!qWbTV
yw8du%r*gu>9g247UyYodC>CbM3+Iot*@H5E-lp;8NDu_N1^fbRJrb0@DZc<N5X*4@

delta 240
zcmcb(Q>AH(O2Zb${3Y!I%NT)}35c1u3oK)CN}HZ<#HuoV-Agu(>F3-yxTZUNV9}iZ
zi<eb+y7_-*-s!@;tR~ZEak5HGPv!*@7dTmkrcdN$m6^VgmsNhc-$xda=?7HVIj4UG
ziLGAG&NcagJkNB4CMMSDhJ38z(-qEg@K2BDV>Ot*?F5V9bbf1A<>>;hOdQkCbFuPH
z{{WKE;Ad5wZo|#WKRtt=Rd@QcGaLfbxAL>v@_9LiIlA~edj`9E0jcTntsGL*_X)6a
hPLB~_m7L!An?<qxg#arMvjH(X5OZvQA;9^P8vsPmO@IIZ

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 0966fa57746..fdf35505023 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(gb_CustomTarget_workdir)/odk/check/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index d30c7164776..500348a7ea6 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,8 +43,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 8c1728671d9..405d84a72db 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2